Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Capture the property bag from metadata request and pass it to Function load request #8895

Merged
merged 6 commits into from
Nov 9, 2022

Conversation

soninaren
Copy link
Member

@soninaren soninaren commented Nov 7, 2022

resolves #8302
resolves #8898

Pull request checklist

  • My changes do not require documentation changes
    • Otherwise: Documentation issue linked to PR
  • My changes should not be added to the release notes for the next release
    • Otherwise: I've added my notes to release_notes.md
  • My changes do not need to be backported to a previous version
    • Otherwise: Backport tracked by issue/PR #issue_or_pr
  • My changes do not require diagnostic events changes
    • Otherwise: I have added/updated all related diagnostic events and their documentation (Documentation issue linked to PR)
  • I have added all required tests (Unit tests, E2E tests)

Additional information

Additional PR information
As part of work for project stein. The function host send a metadata request to the worker process to get the function metadata. That worker would index functions and send the function metadata response. This request is only sent to one worker, however there is indexing related data that needs to be shared between workers.

Proposed solution.

  1. Worker sends the data that it needs to share between workers as part of the function metadata response with a prefix "worker."
  2. The host reads the properties from the RpcFunctionMetadata and includes the properties in the function load request.

@soninaren soninaren requested a review from a team as a code owner November 7, 2022 14:59
@mathewc
Copy link
Member

mathewc commented Nov 7, 2022

PR description doesn't include any details or reference any bug for context. Please provide this info so reviewers know what you're trying to accomplish. I.e. fill out the template.

@soninaren
Copy link
Member Author

PR description doesn't include any details or reference any bug for context. Please provide this info so reviewers know what you're trying to accomplish. I.e. fill out the template.

Apologies for not adding the details early on. I just wanted to get a build going. However, I waited too long to add the details. Going to add them ASAP.

@soninaren
Copy link
Member Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Copy link
Contributor

@jviau jviau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor comments

src/WebJobs.Script.Grpc/Channel/GrpcWorkerChannel.cs Outdated Show resolved Hide resolved
src/WebJobs.Script.Grpc/Channel/GrpcWorkerChannel.cs Outdated Show resolved Hide resolved
src/WebJobs.Script.Grpc/Channel/GrpcWorkerChannel.cs Outdated Show resolved Hide resolved
src/WebJobs.Script.Grpc/Channel/GrpcWorkerChannel.cs Outdated Show resolved Hide resolved
@soninaren soninaren merged commit d1f206f into dev Nov 9, 2022
@soninaren soninaren deleted the nasoni/propertyBag branch November 9, 2022 00:36
@soninaren
Copy link
Member Author

/backport to v3.x

@github-actions
Copy link
Contributor

github-actions bot commented Nov 9, 2022

@github-actions
Copy link
Contributor

github-actions bot commented Nov 9, 2022

@soninaren backporting to v3.x failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Capture the property bag from metadata request and pass it to Function load request
Using index info to reconstruct a base tree...
M	src/WebJobs.Script.Grpc/Channel/GrpcWorkerChannel.cs
M	test/WebJobs.Script.Tests/Workers/Rpc/GrpcWorkerChannelTests.cs
M	test/WebJobs.Script.Tests/Workers/Rpc/TestFunctionRpcService.cs
Falling back to patching base and 3-way merge...
Auto-merging test/WebJobs.Script.Tests/Workers/Rpc/TestFunctionRpcService.cs
CONFLICT (content): Merge conflict in test/WebJobs.Script.Tests/Workers/Rpc/TestFunctionRpcService.cs
Auto-merging test/WebJobs.Script.Tests/Workers/Rpc/GrpcWorkerChannelTests.cs
CONFLICT (content): Merge conflict in test/WebJobs.Script.Tests/Workers/Rpc/GrpcWorkerChannelTests.cs
Auto-merging src/WebJobs.Script.Grpc/Channel/GrpcWorkerChannel.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Capture the property bag from metadata request and pass it to Function load request
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
5 participants